Revision: bazaar--annotate--1.2--patch-31
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Wed Mar  2 22:53:11 EST 2005
Standard-date: 2005-03-02 11:53:11 GMT
Modified-files: baz/Makefile.in commands/import.c
    commands/import.h commands/tests/Makefile.in
    libarch/invent.c libarch/invent.h libarch/merge.c
    libarch/pfs-sftp.c libarch/tests/Makefile.in
    tests/Makefile.in tests/test-archive-registration.sh
    tests/test-cacherev.sh tests/test-commit.sh
    tests/test-diff.sh tests/test-file-diff-baz.sh
    tests/test-file-diff-tla.sh tests/test-framework
    tests/test-import-baz.sh tests/test-merge.sh
New-patches: mlh@zip.com.au--tla/baz-mlh--devo--1.1--base-0
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-1
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-2
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-3
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-4
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-5
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-6
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-7
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-8
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-9
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-10
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-11
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-12
    mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-13
    rob.weir@canonical.com--2004-public/baz--import--0--patch-14
    rob.weir@canonical.com--2004-public/baz--import--0--patch-15
    rob.weir@canonical.com--2004-public/baz--import--0--patch-16
    rob.weir@canonical.com--2004-public/baz--import--0--patch-17
    rob.weir@canonical.com--2004-public/baz--import--0--patch-18
    robert.collins@canonical.com--general/bazaar--annotate--1.2--patch-31
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-50
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-51
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-52
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-53
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-54
    thelove@canonical.com/bazaar--devo--1.2--patch-31
    thelove@canonical.com/bazaar--devo--1.2--patch-32
    thelove@canonical.com/bazaar--devo--1.2--patch-33
    thelove@canonical.com/bazaar--devo--1.2--patch-34
Summary: merge from thelove
Keywords: 

Patches applied:

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-122

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-1
   Use configured versions of diff, patch for tests

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-2
   Use -lsocket, -lnsl and -lresolv libraries if available

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-3
   Use -lsocket, -lnsl and -lresolv libraries if available for libarch/tests

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-4
   Don't do shell 'for loop' if nothing to loop over

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-5
   Use -lsocket, -lnsl and -lresolv libraries if available for commands/tests

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-6
   Don't do shell 'for loop' if nothing to loop over (commands/tests)

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-7
   fix missing ) in setting patch_prog -- typo in patch-1

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-8
   escape + in egrep expression in test-file-diffs

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-9
   replace rm $HOME/.arch-params -R 

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-10
   don't unset EDITOR if already unset (null)

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-11
   Use comment ($1) rather than mktemp to create file to be committed

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-12
   egrep requires {} to be escaped if not a valid {m,n} RE count

 * mlh@zip.com.au--tla/baz-mlh--devo--1.1--patch-13
   Use configured version of patch for test-file-diff-tla.sh -- missed before

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-14
   add --automatic flag.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-15
   get rid of default_archive.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-16
   use --automatic in baz import tests.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-17
   fix up --automatic for baz import.

 * rob.weir@canonical.com--2004-public/baz--import--0--patch-18
   constify some prototypes.

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-50
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-51
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-52
   integrate mlhs solaris fixes

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-53
   handle PARTIAL ancestry when performing merges

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-54
   fix race condition with failed sftp sessions where SIGPIPE was triggered and terminated baz

 * thelove@canonical.com/bazaar--devo--1.2--patch-31
   Fix up new import interface.

 * thelove@canonical.com/bazaar--devo--1.2--patch-32
   integrate mlhs solaris fixes

 * thelove@canonical.com/bazaar--devo--1.2--patch-33
   handle PARTIAL ancestry when performing merges

 * thelove@canonical.com/bazaar--devo--1.2--patch-34
   fix race condition with failed sftp sessions where SIGPIPE was triggered and terminated baz

